blktap2: fix parallel Make.

sub make in tools/blktap2/daemon/lib and tools/lvd/lib
can be triggered many times at the same time which results in
weired link error because one target is linking a library while
another target is trying to recreate the library.

This patch makes it invoke submake only once.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/tools/blktap2/daemon/Makefile b/tools/blktap2/daemon/Makefile
index aedef967219baa1c8bf6c48ceb207afa6829e1b5..ab974a99520d035ec441d342d82cecfab40a7e70 100644 (file)
--- a/tools/blktap2/daemon/Makefile
+++ b/tools/blktap2/daemon/Makefile
@@ -34,7 +34,10 @@ DEPS          = .*.d
 
 all: $(IBIN)
 
-blktapctrl: tapdisk-daemon.c $(OBJS) subdir-all-lib
+LIBS_DEPENDS := lib/libblktap.a lib/libblktap.so
+$(LIBS_DEPENDS):subdirs-all
+
+blktapctrl: tapdisk-daemon.c $(OBJS) $(LIBS_DEPENDS)
        $(CC) $(CFLAGS) -o blktapctrl tapdisk-daemon.c $(LDFLAGS) $(LIBS) $(OBJS)
 
 install: all

diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index fc0565e14f8cb7797d7ff1cd51d0733b73655af9..8b4d7b5ca0494e204bb7e6736d01b4c87818d54e 100644 (file)
--- a/tools/blktap2/vhd/Makefile
+++ b/tools/blktap2/vhd/Makefile
@@ -32,10 +32,13 @@ all: build
 
 build: $(IBIN)
 
-vhd-util: vhd-util.o subdir-all-lib
+LIBS_DEPENDS     := lib/libvhd.so lib/vhd.a
+$(LIBS_DEPENDS):subdirs-all
+
+vhd-util: vhd-util.o $(LIBS_DEPENDS)
        $(CC) $(CFLAGS) -o vhd-util vhd-util.o $(LDFLAGS) $(LIBS)
 
-vhd-update: vhd-update.o subdir-all-lib
+vhd-update: vhd-update.o $(LIBS_DEPENDS)
        $(CC) $(CFLAGS) -o vhd-update vhd-update.o $(LDFLAGS) $(LIBS)
 
 install: all